fixed compliance issues