Small fixes
Fixed som errors with method callbacks