Some bugs cleaned