Adjusted to latest JGoodies versions