Fix miscellaneous things

Huh how come it fails now when it can be merged previously?