Fixes for Remo and Mike's comments