A few fixes after testing