Small fixes

Small fixes from old version