0500: Small fixes and clean up