Some fixes, hope this works