Investors & landlords

Yes, you have treated both items correctly.  

Loan fees would be expensed as they are not considered part of the capital costs. 

Mortgage broker fees are considered to be part of your basis in the rental property.

Please see the following excerpt from this IRS publication for more details.