some fixes for separating web/app