Fix little annoying bugs while waiting for dev meeting.