Some fixes to have our engine going