Integration bugfixes
TODO: Add anti-aliasing.