Bugfix for FEC 1/2

Some other minor changes, nothing exciting really!