Attempt to fix some style issues