Some fixes/etc