Both fixes were made by @ioraff. NOTE: --disable-bootstrap has been added to aid in compile times. This is fine as we are going from 9.2.0 to... 9.2.0.