small mergefixes