Clean up some minor issues