Fix some smaller annoyances, closes #583, #582