Fixes and very minor additions