I used Vinai guide and these exact two advices caused issues as the api grow.