Some fixes, dodgy though...