Merged work: minor stuff