Minor changes due to build errors given when compiling on BBB