ikrutt-WIP III, small but important fixes from the previous batch. Did I mention that this is indeed