various fixes
fix