A series of final fixes to get Salsa20 working