Fixes based on forum topic