Use ALIGN_UP() macro for alignment, in a more correct way also.