Minor improvements to method signatures