Fixing bugs after applying system to commons project