Part 4: Minor nitpick fixes
Part 5: Imported all changes from part 4