Check in small changes to prepare for branch