Some polish on fake server