Clean up small issues