Updates and fixes

Fixes some errors