Fix some compatibility stuff and spacing