Fixes up some minor details