Minor Fixes for compatibility (FR, Client, LS, DB)