Valoris: Bug Fixes

Several bug fixes