Dirty commit. Fixes for server usage.