More fixes
Even more fixes