Fixes for POCs