@orta => Fixes

Some miscellaneous fixes. Will post more as I get them.