Some fixes/tests