Fix Dylan's commits

Make Dylan's code compile...again