Bug fixes - End of november