Add missing methods
CS fixes