Warning & typo fixes