Fixed some unwanted differences with master