Removed alps_base in a few more places