Minor tweaks + fixes