Fixed small issues, which came out as consequence of merging two branches.