Fixed implementations of 2 methods