Sync up with CM a little