Fix various, dont merge forgot something