FIX: Issues that didn't show up originally