Fixing paper merge issues
Small changes