Non-Compliance

Small fixes