Fix up temp code