Minor updates: removed some warnings and added a FIXME about getting the mutex lock too often