Wow, some fixes