Fixing up clockwork deps and ctap