Small message and vim modeline fixes