Minor improvements to application