small mapping changes (fixes I hope)