Minor updates to fix issues