fixes for current github API + R16B02 compat