Hopefully fixed issues cause by removing JGoodies from the project.