Fixed mapping and some other error