Small fixes

Small fixes