Fixes for local testing