fixes for fun mode