Ironing out wrinkles from previous commits