fix some warnings, make master project compile