New tweaks to application base