Compile fixes by janv