diff --git a/supysonic/managers/folder.py b/supysonic/managers/folder.py
index 51206d7..c138403 100644
--- a/supysonic/managers/folder.py
+++ b/supysonic/managers/folder.py
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os.path, uuid
-from supysonic.db import Folder, Artist, Album, Track
+from supysonic.db import Folder, Artist, Album, Track, StarredFolder, RatingFolder
 from supysonic.scanner import Scanner
 
 class FolderManager:
diff --git a/supysonic/managers/user.py b/supysonic/managers/user.py
index 8e7821a..211dfa1 100644
--- a/supysonic/managers/user.py
+++ b/supysonic/managers/user.py
@@ -21,7 +21,9 @@
 import string, random, hashlib
 import uuid
 
-from supysonic.db import User
+from supysonic.db import User, ChatMessage, Playlist
+from supysonic.db import StarredFolder, StarredArtist, StarredAlbum, StarredTrack
+from supysonic.db import RatingFolder, RatingTrack
 
 class UserManager:
 	SUCCESS = 0
diff --git a/supysonic/scanner.py b/supysonic/scanner.py
index 7545331..783ae31 100644
--- a/supysonic/scanner.py
+++ b/supysonic/scanner.py
@@ -26,7 +26,9 @@ from storm.expr import ComparableExpr, compile, Like
 from storm.exceptions import NotSupportedError
 
 from supysonic import config
-from supysonic.db import Folder, Artist, Album, Track
+from supysonic.db import Folder, Artist, Album, Track, User, PlaylistTrack
+from supysonic.db import StarredFolder, StarredArtist, StarredAlbum, StarredTrack
+from supysonic.db import RatingFolder, RatingTrack
 
 def get_mime(ext):
 	return mimetypes.guess_type('dummy.' + ext, False)[0] or config.get('mimetypes', ext) or 'application/octet-stream'
@@ -203,7 +205,7 @@ class Scanner:
 		self.__store.find(StarredTrack, StarredTrack.starred_id == tr.id).remove()
 		self.__store.find(RatingTrack, RatingTrack.rated_id == tr.id).remove()
 		self.__store.find(PlaylistTrack, PlaylistTrack.track_id == tr.id).remove()
-		self.__store.find(User, User.last_play_id == tr.id).set(User.last_play_id = None)
+		self.__store.find(User, User.last_play_id == tr.id).set(last_play_id = None)
 
 		self.__folders_to_check.add(tr.folder)
 		self.__albums_to_check.add(tr.album)