Attempted fixes for some small issues