Fix session methods