Missing method support and a few bugs