Fix initialisation and map searching