Fixed up some bugs found in aloha.