Fixes and more preprocessing