Little Fixes

Just a couple of little fixes, introduces a bug with the finder class