Very small changes to merged code