Fix type qualifiers