Fixed VC14 compiler warnings