Fix automatic preparation for static components