Minor fixes

Fixed some stuff I came across while playing.