fixes for base update