Fixes and PID tweaks