even more ugly fixes