Cleaning up issues with last merge