Various fixes/shuffling around