some fixes to work with bowser