Forgot few fixes