Pab/devel

Fix some clang related issues