Fixes

Various fixes