Bug fixes last minute