Clean up of various minor issues