J20 few fixes