Rollback unnecessary changes on lockshw
Several fixes, Ticks are alive now.