0.76 Small fixes