Bugfixes for 5.4.2 and some new addition