fixes to datatap loading