some fixes
fix