A lot of fixes in core methods