Some fixes
Ah
Argh