Big fixes based on dev server testing