More F4 styling fixes #46