More molokai changes.