A few more changes that should've been included before