Further fixes and deployment prep