fp/add: Second pass on all setup methods