Clean up minor issues