Get fixes from master repo

Get the latest tweaks from the master repository