Fix compatibility issues with st3