Fixes based on discussion with @Gozala