Fixes for bugs post production