some compile fixes for std changes