aloha fixes