Fix ups