Fixed class attribute/method calls.
Fixed merge conflicts.