Finish some style problems