Minor application refactorings