Fixed some compliance issues