Fixed padding bug, and non-null IV values