Tmp: Fix style issues