Minor bug fixes / astyle=GNU