Minor change and minor fix