Fixes for discussion