Fixes for the UtilBot take-over since I can never get anything right on the first try, even when it works fine in dev.