Latest small updates to local code