Fixes to get fembem notes compiling again.