'Minor issues' still to be resolved in public safety bill as