more combining fixes