Some fixes but still not ideal