Fixes

Small fixes.