BUG Fix some mapping issues