Minor Modifications for the Mobile Components