Little fixes to make it pretty