Small fixes and aliases