Fixed bug with a couple ivars not being set in init.