Final tidy up, fixes for jpeg bicubic