Some more fixes, moved utilities back into FinePrint module