Final development fixes