Fixed bugs in standard csrc compilation environment introduced due to changes in context
New bugs/features