Fixes and additions to a few things