bug fixes, R2RML TC 2