Various fixes for move to glue dir and ahrs