Integral fixes, last parts