Fixin issues with last merge