Minor fixes and playing around with property placeholders in Spring.