Fixes for the last merge