Fixed post GPL 3.0 bugs