fixed some issues with resolve command