Superfluous Returnz: Minor fixes

Various minor bug fixes