Update to latest code

Update to version 3.0 fixes