More fixes due to R2L implementation (bugs were posted to squirrel-devel)