Misc tiny fixes & JShint CS fixes