Fixing silly bugs