Fixed all errors in ServerStorage