Some more fine tunning for the next rc