Updates to keep marketplace happy