Finalize style issues