Fixing a few bugs and finalizing deploy run.