Some blabla changes for 6.0.3