Fix formatter problems