Minor changes and add local customizations