20: More kwargs fixing block kwargs don't classcastexception (icky fix until 9k)