Some fixes - again, still failing of course