Updates to fix compile warnings and errors