Some refixes