Fixed stuff for my own use case.