Fixes for small front end problems