Fixed bugs from another project leaking into this one.
merge