Fix #418 and #420 (aliases missing for documentation and companies)