Fix BCs wrt. devel.