Cleanup, fix callbacks