Some fixes to ligthshaft