Fixed an odd few optional compile errors, because, why not?