A few small updates to totally sync up