More klockwork patches