tmp fixes
some on the fly fixes