Misc tiny fixes