Restoring some methods which were needed after all. Facepalm.