Fixes for maybe.