Fixes for 269