fixes for mappings and graphics