Anomaly fixes changes suggested by Marek