Fixes and logic