Forgot some fixes