slight modifications to account for new compiler warnings