Style and model fixes