Fixes, removing the "maybe" option