Uprev and minor fix for last checkin