Merged in minor local changes