Nitroglycerin line fixes (including lint fixes)