Really last fixes

@Vexatos, do the PR now!