Fixes for Variar's PR comments