Small changes to prepare to clone to server