Fix embarassing errors