Misc fixes & clarifications