Bringing up to date 

Just a couple of things updated to keep in line with remainder of mybatis.