Assorted Fixes