Fixes and markups