Fixes

Small fixes