functional fixes handled