Temporary fix for two problems with sermepa.