modifications to core to remove kwarg passing errors