Bug fixes
Spring cleanup