Fix shop bugs