Iron out remaining bugs from last couple of changes