[ACT-1758] Finishing touches.