Minor changes to improve integration