Duplicate method fixes