Some quick bug fixes before submitting to store