Minor development fixes