Fix incorrect arguments, which failed the build
Fix compiler warnings