more fixes

Some more fixes