Fixed silly bugs