Fixed some extendable methods