Fixing violations W293 and W391