Clean up stupid problems