Fixed some problems with 4w3e