3 Fixes

See 3 Fixes