Minor bug fixes & tweaks