Fixed dumb bugs