dev

Fixed issues noticed by the static code analyzer