Fix constant construction