Small bug and name fixes