Continue solving some structural issues with application