Fixed deprecated .getInstance() calls