Fixes (ongoing PR -> wait to merge)