Bug fixes

Couldn't access internal objects.