Fixed (most) issues from last commit.