Fixed embarrassing errors