Clean up minor problems here and there