bug fixes / compiler warnings
Merged