Fixing wrong warning/minor bugs [ci skip]