Cleanups & fix for stupid aliases