More docblock / return-type fixes