Other fixes for DASPRiD :P