typecheck target improvements