Fixed some smaller things