Minor fixes. Still borked though