Clean up some minor annoyances