Some fixes for nontrivial characters