Fixes for Eric