Some bigfixes