These changes were requested by the vendor, hence fix them accordingly. Signed-off-by: Eero Nurkkala <eero.nurkkala@offcode.fi>