Hotfix compiler warnings 20141110