Fixed: Prevent concurrent processes
Small fixes