Fixes on default bug