bug fixes (still within extended LD26 submit time)