small mapping fixes, thanks to Marcin