Fixed some issues with items and maps