Class implementation fixes