Some fixes, add method keys