Fixes

A few small fixes from Alex