Minor refactoring (commit: 61af233)
Fix error messages (commit: 6939e83)
Fix subscripts handling with records (commit: 043a395)