Bug fixes of stupidity

Late night simple tasks