fixed some issues with properties access.