Version 0.5.03 catchup and fixes