3482ffa (HEAD, refs/remotes/origin/src, refs/heads/src) additional fixes