- some strange fixes