Fixes, reduced complexity