Restored fixes related to procedural coding which was accidentally removed