Fixing V4 compatibility stuffs