commit taniwha's .23 fixes