Development Fixes

Just started on Dexter again, ran into a couple of issues while rebuilding the db. Nothing major.