#3 Small fixes