Some fixes for the data capture