Adding a handful of constants that I could spot