Docblock and return type fixes