Fixes

A few fixes