Fixing bugs from last major changes