Made little bug fixes