Minor bugs and psa