Fix some small styles and edge cases