Some minor bugfixes, commited to store