Curie fixes
Further curie related fixes