a workaround commit - fixed misc bugs