Attempt to fix style issues