Some minor fixes (aliases, doc blocks)