Extra checks and doc block tweaks