Cleanup minor things