Hopefully fixed a bit more issues.