Small fixes, still need to handle caching for classify