Fix; crash
Various fixes
bla