Some fixes for future shuttle juke