Essential fixes