amirite: minor fixes