Some little fixes and updates