Fix up some code
aa