Version 3.5004

A few more draconic fixes