Fixes + backwards compatibility methods

In the title ;)