Cleanup of introduced bugs