Fixed few bugs (concurrent)