Main Fixes