Fixes for class calls