Fixing issues reported by Speedst3r