Bug fixes and deploy prep