Here's some fixes