Minor lesser fixes from the hell