Fix issues reported by user - JediBees - RES-692