Small changes made as a result of recent merges