Moving some method calls from before save to before validates