Fixes
more fixes