Some fixes, tweaks