Quick company tag fix

Fix two small bugs