Fixing bugs introduced with last push *sigh*