Fix tons of issues