last second fixes