Fixing fe bugs