Bug fix: Don't pass unresolved properties to command line