Updates to work around issues with unexported methods