Fix codestyle and doc blocks from 3.3 merge