try to fix compile / cleanup