Minor visibility fixes, added method