Fixes and updates for 0.8.3 that was published to nexusoss