Minor changes due to compiling new build