Store bug fixes from 201301